JavaDoc and further edits