Refactor commentings
Fixing Bugs, but not critical :-)