Javadoc in GUILogic and comments & cleaning up