Fix Javadocs, minor code tweaks