Added less variable support,
+bug fixes