JavaDoc fixes, general cleanup