diff --git a/autocomplete.d b/autocomplete.d
index 6a4ddaa..f57339f 100644
--- a/autocomplete.d
+++ b/autocomplete.d
@@ -169,16 +169,12 @@ struct AutoComplete
 
 	string parenComplete(size_t cursor)
 	{
-		stderr.writeln("parenComplete");
 		auto index = assumeSorted(tokens).lowerBound(cursor).length - 2;
 		Token t = tokens[index];
-		stderr.writeln(t);
-		if (t.startIndex + t.value.length + 1 != cursor)
-			return "";
 		switch (tokens[index].type)
 		{
 		case TokenType.Version:
-			return to!string(join(map!`a ~ "?1"`(versions), " ").array());
+			return to!string(join(map!`a ~ "?5"`(versions), " ").array());
 		case TokenType.If:
 		case TokenType.Cast:
 		case TokenType.While:
diff --git a/main.d b/main.d
index 8d6e78b..f58e3bc 100644
--- a/main.d
+++ b/main.d
@@ -128,7 +128,6 @@ string[] loadConfig()
 	return dirs;
 }
 
-
 void main(string[] args)
 {
 	string[] importDirs;
@@ -159,6 +158,10 @@ void main(string[] args)
 
 	if (dotComplete || parenComplete)
 	{
+		if (isAbsolute(args[1]))
+			importDirs ~= dirName(args[1]);
+		else
+			importDirs ~= getcwd();
 		auto tokens = args[1].readText().tokenize();
 		auto mod = parseModule(tokens);
 		auto context = new CompletionContext(mod);
diff --git a/tokenizer.d b/tokenizer.d
index fbbf110..4a61f07 100644
--- a/tokenizer.d
+++ b/tokenizer.d
@@ -164,7 +164,8 @@ body
 	{
 		++endIndex;
 	}
-	return inputString[startIndex .. endIndex];
+	auto e = endIndex > inputString.length ? inputString.length : endIndex;
+	return inputString[startIndex .. e];
 }
 
 /**
diff --git a/types.d b/types.d
index 2016620..5588438 100644
--- a/types.d
+++ b/types.d
@@ -349,16 +349,9 @@ protected:
 
 }
 
-/**
- * Module is a container class for the other classes
- */
-class Module
+class HasDeclarations
 {
 public:
-
-	/// Module name. Will be blank if there is no module statement
-	string name;
-
 	/// List of interfaces declared in this module
 	Inherits[] interfaces;
 
@@ -379,6 +372,17 @@ public:
 
 	/// List of enums declared in this module
 	Enum[] enums;
+}
+
+/**
+ * Module is a container class for the other classes
+ */
+class Module : HasDeclarations
+{
+public:
+
+	/// Module name. Will be blank if there is no module statement
+	string name;
 
 	/// List of other modules that are imported by this one
 	string[] imports;