Javadocs and belated merge fix

Fixing the horrifying repercussions of the last merge conflict