+File support
+some language fixes