Packaging and javadoc edits