Still cleaning up javadocs and fixing tiny bugs.