Mostly JavaDoc updates