Fix and update JavaDoc entries, and correct areas with wildy inconsistent whitespace / style to the surrounding code