Julia's editings
crazy night fixes
+bugfixes