Cleaned up the code. Added comments for new classes.
Fixed a Javadoc comment mistake and updated Javadoc.