Cleaned up code, added javadoc. Preparing to hand over project.