Cleaned up and removed some debugging logs that are not necessary anymore. Continued work on comments and javadoc.