Updated some javadoc and fixed some formatting.