minor tweaks, bugfixes, javadoc