Better commenting, some fixes to the classes.