--- a/src/luan/lib/BasicLib.java	Mon Jun 09 09:16:16 2014 +0000
+++ b/src/luan/lib/BasicLib.java	Tue Jun 10 02:43:40 2014 +0000
@@ -43,7 +43,6 @@
 				add( global, "load", LuanState.class, String.class, String.class, Boolean.class, Boolean.class );
 				add( global, "load_file", LuanState.class, String.class );
 				add( global, "pairs", LuanState.class, LuanTable.class );
-//				add( global, "print", LuanState.class, new Object[0].getClass() );
 				add( global, "range", LuanState.class, Double.TYPE, Double.TYPE, Double.class );
 				add( global, "raw_equal", Object.class, Object.class );
 				add( global, "raw_get", LuanTable.class, Object.class );
@@ -66,19 +65,7 @@
 	private static void add(LuanTable t,String method,Class<?>... parameterTypes) throws NoSuchMethodException {
 		t.put( method, new LuanJavaFunction(BasicLib.class.getMethod(method,parameterTypes),null) );
 	}
-/*
-	public static void print(LuanState luan,Object... args) throws LuanException {
-		LuanFunction write = (LuanFunction)luan.get("Io.stdout.write");
-		List<Object> list = new ArrayList<Object>();
-		for( int i=0; i<args.length; i++ ) {
-			if( i > 0 )
-				list.add("\t");
-			list.add(args[i]);
-		}
-		list.add("\n");
-		write.call(luan,list.toArray());
-	}
-*/
+
 	public static String type(Object obj) {
 		return Luan.type(obj);
 	}
@@ -99,7 +86,7 @@
 			String src = fileName==null ? Utils.readAll(new InputStreamReader(System.in)) : new IoLib.LuanFile(fileName).read_text();
 			return load(luan,src,fileName,false,false);
 		} catch(IOException e) {
-			throw luan.JAVA.exception(e);
+			throw luan.exception(e);
 		}
 	}
 
@@ -108,18 +95,18 @@
 			String src = new IoLib.LuanUrl(IoLib.java_resource_to_url(path)).read_text();
 			return load(luan,src,path,false,false);
 		} catch(IOException e) {
-			throw luan.JAVA.exception(e);
+			throw luan.exception(e);
 		}
 	}
 
 	public static Object do_file(LuanState luan,String fileName) throws LuanException {
 		LuanFunction fn = load_file(luan,fileName);
-		return luan.JAVA.call(fn,null);
+		return luan.call(fn);
 	}
 
 	public static Object do_java_resource(LuanState luan,String path) throws LuanException {
 		LuanFunction fn = load_java_resource(luan,path);
-		return luan.JAVA.call(fn,null);
+		return luan.call(fn);
 	}
 
 	private static LuanFunction pairs(final Iterator<Map.Entry<Object,Object>> iter) {
@@ -174,7 +161,7 @@
 			LuanTable t = (LuanTable)v;
 			return t.length();
 		}
-		throw luan.JAVA.exception( "bad argument #1 to 'raw_len' (table or string expected)" );
+		throw luan.exception( "bad argument #1 to 'raw_len' (table or string expected)" );
 	}
 
 	public static Number to_number(Object e,Integer base) {
@@ -182,11 +169,11 @@
 	}
 
 	public static String to_string(LuanState luan,Object v) throws LuanException {
-		return luan.JAVA.toString(v);
+		return luan.toString(v);
 	}
 
 	public static void error(LuanState luan,Object msg) throws LuanException {
-		throw luan.JAVA.exception(msg);
+		throw luan.exception(msg);
 	}
 
 	public static Object assert_(LuanState luan,Object v,String msg) throws LuanException {
@@ -194,7 +181,7 @@
 			return v;
 		if( msg == null )
 			msg = "assertion failed!";
-		throw luan.JAVA.exception( msg );
+		throw luan.exception( msg );
 	}
 
 	public static String assert_string(LuanState luan,String v) throws LuanException {
@@ -218,18 +205,18 @@
 
 	public static Object assert_nil(LuanState luan,Object v) throws LuanException {
 		if( v != null )
-			throw luan.JAVA.exception("bad argument #1 (nil expected, got "+Luan.type(v)+")");
+			throw luan.exception("bad argument #1 (nil expected, got "+Luan.type(v)+")");
 		return v;
 	}
 
 	public static String repr(LuanState luan,Object v) throws LuanException {
-		return luan.JAVA.repr(v);
+		return luan.repr(v);
 	}
 
 	public static LuanFunction range(LuanState luan,final double from,final double to,Double stepV) throws LuanException {
 		final double step = stepV==null ? 1.0 : stepV;
 		if( step == 0.0 )
-			throw luan.JAVA.exception("bad argument #3 (step may not be zero)");
+			throw luan.exception("bad argument #3 (step may not be zero)");
 		return new LuanFunction() {
 			double v = from;