more javadocs, minor edits