more changes with comments and stuch
-