CLEANUP: Remove warnings, fix javadocs.