Refactoring, cleanup, javadoc and the awesome framecounter.