Formatting fixes and javadoc additions for the new methods.