Refactoring, Comments, Minor Bugfixes