Some classes updated, comments added.