diff --git a/ase/config.h.in b/ase/config.h.in
index edf7d2f2..122890a5 100644
--- a/ase/config.h.in
+++ b/ase/config.h.in
@@ -85,6 +85,9 @@
 /* sys/sysinfo.mem_unit */
 #undef XP_HAVE_SYS_SYSINFO_MEM_UNIT
 
+/* in6.scope_id */
+#undef XP_HAVE_IN6_SCOPE_ID
+
 /* char is wchar */
 #undef XP_CHAR_IS_WCHAR
 
diff --git a/ase/configure b/ase/configure
index 999dff12..e8fb538a 100755
--- a/ase/configure
+++ b/ase/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.54 .
+# From configure.ac Revision: 1.55 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for xpkit deb-0.1.0.
 #
@@ -5039,14 +5039,13 @@ _ACEOF
 
 fi
 
-
 fi
 
 
 
-echo "$as_me:$LINENO: checking for struct sockaddr_in6.scope_id" >&5
-echo $ECHO_N "checking for struct sockaddr_in6.scope_id... $ECHO_C" >&6
-if test "${ac_cv_member_struct_sockaddr_in6_scope_id+set}" = set; then
+echo "$as_me:$LINENO: checking for struct sockaddr_in6.sin6_scope_id" >&5
+echo $ECHO_N "checking for struct sockaddr_in6.sin6_scope_id... $ECHO_C" >&6
+if test "${ac_cv_member_struct_sockaddr_in6_sin6_scope_id+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
@@ -5055,13 +5054,15 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <netinet/in.h>
+#include <sys/types.h>
+	 #include <sys/socket.h>
+	 #include <netinet/in.h>
 
 int
 main ()
 {
 static struct sockaddr_in6 ac_aggr;
-if (ac_aggr.scope_id)
+if (ac_aggr.sin6_scope_id)
 return 0;
   ;
   return 0;
@@ -5089,7 +5090,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_member_struct_sockaddr_in6_scope_id=yes
+  ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@ -5100,13 +5101,15 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <netinet/in.h>
+#include <sys/types.h>
+	 #include <sys/socket.h>
+	 #include <netinet/in.h>
 
 int
 main ()
 {
 static struct sockaddr_in6 ac_aggr;
-if (sizeof ac_aggr.scope_id)
+if (sizeof ac_aggr.sin6_scope_id)
 return 0;
   ;
   return 0;
@@ -5134,20 +5137,20 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_member_struct_sockaddr_in6_scope_id=yes
+  ac_cv_member_struct_sockaddr_in6_sin6_scope_id=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_member_struct_sockaddr_in6_scope_id=no
+ac_cv_member_struct_sockaddr_in6_sin6_scope_id=no
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_scope_id" >&5
-echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in6_scope_id" >&6
-if test $ac_cv_member_struct_sockaddr_in6_scope_id = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&5
+echo "${ECHO_T}$ac_cv_member_struct_sockaddr_in6_sin6_scope_id" >&6
+if test $ac_cv_member_struct_sockaddr_in6_sin6_scope_id = yes; then
 
 cat >>confdefs.h <<\_ACEOF
 #define XP_HAVE_IN6_SCOPE_ID
diff --git a/ase/configure.ac b/ase/configure.ac
index 03028196..c5aefa2d 100644
--- a/ase/configure.ac
+++ b/ase/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 AC_INIT([xpkit], [deb-0.1.0])
-AC_REVISION([$Revision: 1.55 $])
+AC_REVISION([$Revision: 1.56 $])
 AC_CONFIG_HEADER([xp/config.h])
 
 # Checks for programs.
@@ -33,13 +33,14 @@ AC_CHECK_HEADER([sys/sysinfo.h], [
 	AC_CHECK_MEMBER(struct sysinfo.mem_unit,
 		[AC_DEFINE([XP_HAVE_SYS_SYSINFO_MEM_UNIT],[],[sys/sysinfo.mem_unit])],
 		[],
-		[#include <sys/sysinfo.h>])
-])
+		[#include <sys/sysinfo.h>])])
 
-AC_CHECK_MEMBER(struct sockaddr_in6.scope_id,
+AC_CHECK_MEMBER(struct sockaddr_in6.sin6_scope_id,
 	[AC_DEFINE([XP_HAVE_IN6_SCOPE_ID],[],[in6.scope_id])],
 	[],
-	[#include <netinet/in.h>])
+	[#include <sys/types.h> 
+	 #include <sys/socket.h> 
+	 #include <netinet/in.h>])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_BIGENDIAN(
diff --git a/ase/stx/parser.c b/ase/stx/parser.c
index 994d2d88..43351f25 100644
--- a/ase/stx/parser.c
+++ b/ase/stx/parser.c
@@ -1,5 +1,5 @@
 /*
- * $Id: parser.c,v 1.79 2005-12-05 15:11:29 bacon Exp $
+ * $Id: parser.c,v 1.80 2006-01-30 16:44:03 bacon Exp $
  */
 
 #include <xp/stx/parser.h>
@@ -81,7 +81,7 @@ xp_stx_parser_t* xp_stx_parser_open (xp_stx_parser_t* parser, xp_stx_t* stx)
 		return XP_NULL;
 	}
 
-	if (xp_array_open (
+	if (xp_arr_open (
 		&parser->bytecode, 256, 
 		xp_sizeof(xp_byte_t), XP_NULL) == XP_NULL) {
 		xp_stx_name_close (&parser->method_name);
@@ -112,7 +112,7 @@ void xp_stx_parser_close (xp_stx_parser_t* parser)
 	}
 	parser->argument_count = 0;
 
-	xp_array_close (&parser->bytecode);
+	xp_arr_close (&parser->bytecode);
 	xp_stx_name_close (&parser->method_name);
 	xp_stx_token_close (&parser->token);
 
@@ -312,7 +312,7 @@ static INLINE int __emit_code_test (
 
 static INLINE int __emit_code (xp_stx_parser_t* parser, xp_byte_t code)
 {
-	if (xp_array_add_datum(&parser->bytecode, &code) == XP_NULL) {
+	if (xp_arr_adddatum(&parser->bytecode, &code) == XP_NULL) {
 		parser->error_code = XP_STX_PARSER_ERROR_MEMORY;
 		return -1;
 	}
@@ -482,7 +482,7 @@ static int __parse_method (
 	GET_TOKEN (parser);
 
 	xp_stx_name_clear (&parser->method_name);
-	xp_array_clear (&parser->bytecode);
+	xp_arr_clear (&parser->bytecode);
 
 	while (parser->temporary_count > 0) {
 		xp_free (parser->temporaries[--parser->temporary_count]);
@@ -534,7 +534,7 @@ static int __finish_method (xp_stx_parser_t* parser)
 	method_obj->selector = selector;
 	method_obj->bytecodes = xp_stx_instantiate (
 		stx, stx->class_bytearray, XP_NULL, 
-		parser->bytecode.buffer, parser->bytecode.size);
+		parser->bytecode.buf, parser->bytecode.size);
 
 	/* TODO: better way to store argument count & temporary count */
 	method_obj->tmpcount = 
diff --git a/ase/stx/parser.h b/ase/stx/parser.h
index 887e99cf..028e1dc8 100644
--- a/ase/stx/parser.h
+++ b/ase/stx/parser.h
@@ -1,5 +1,5 @@
 /*
- * $Id: parser.h,v 1.35 2005-12-05 15:11:29 bacon Exp $
+ * $Id: parser.h,v 1.36 2006-01-30 16:44:03 bacon Exp $
  */
 
 #ifndef _XP_STX_PARSER_H_
@@ -8,7 +8,7 @@
 #include <xp/stx/stx.h>
 #include <xp/stx/name.h>
 #include <xp/stx/token.h>
-#include <xp/bas/array.h>
+#include <xp/bas/arr.h>
 
 enum
 {
@@ -76,7 +76,7 @@ struct xp_stx_parser_t
 	xp_word_t literals[256]; /* TODO: make it a dynamic array */
 	xp_word_t literal_count;
 
-	xp_array_t bytecode;
+	xp_arr_t bytecode;
 
 	xp_stx_token_t token;
 	xp_cint_t curc;