Mostly Javadoc & stylistic improvements