--- a/lucene/src/luan/modules/lucene/Lucene.luan	Sun May 03 16:21:25 2015 -0600
+++ b/lucene/src/luan/modules/lucene/Lucene.luan	Sun May 03 21:28:49 2015 -0600
@@ -13,10 +13,10 @@
 local SortField = require "java:org.apache.lucene.search.SortField"
 
 
-function Index(indexDir)
+function index(indexDir)
 	local index = {}
 	local java_index = LuceneIndex.new(indexDir)
-	index.fields = java_index.fields
+	index.fields = java_index.fields.newTable()
 	index.to_string = java_index.to_string
 	index.backup = java_index.backup
 	index.Writer = java_index.Writer
@@ -61,14 +61,14 @@
 
 
 
-	local Query = {}
-	index.Query = Query
+	local queryTbl = {}
+	index.query = queryTbl
 
-	Query.parse = java_index.parse
+	queryTbl.parse = java_index.parse
 
-	Query.all_docs = MatchAllDocsQuery.new()
+	queryTbl.all_docs = MatchAllDocsQuery.new()
 	
-	function Query.term(t)
+	function queryTbl.term(t)
 		local iter = pairs(t)
 		local field, value = iter()
 		field and value or error "missing term"
@@ -77,7 +77,7 @@
 		return TermQuery.new(Term.new(field,value))
 	end
 	
-	function Query.boolean(t)
+	function queryTbl.boolean(t)
 		local boolean_query = BooleanQuery.new()
 		for query, occur_string in pairs(t) do
 			local occur = BooleanClause.Occur.valueOf( occur_string.upper() )
@@ -87,31 +87,31 @@
 	end
 	
 	-- and list
-	function Query.all(t)
+	function queryTbl.all(t)
 		local bt = {}
 		for key, query in pairs(t) do
 			if type(key)=="string" then
-				query = Query.term{[key]=query}
+				query = queryTbl.term{[key]=query}
 			end
 			bt[query] = "MUST"
 		end
-		return Query.boolean(bt)
+		return queryTbl.boolean(bt)
 	end
 	
 	-- or list
-	function Query.any(t)
+	function queryTbl.any(t)
 		local bt = {}
 		for key, query in pairs(t) do
 			if type(key)=="string" then
-				query = Query.term{[key]=query}
+				query = queryTbl.term{[key]=query}
 			end
 			bt[query] = "SHOULD"
 		end
-		return Query.boolean(bt)
+		return queryTbl.boolean(bt)
 	end
 	
 	
-	function Query.sort(fields)
+	function queryTbl.sort(fields)
 		#fields > 0 or error "list of sort fields expected"
 		local a = {}
 		for _, f in ipairs(fields) do