Minor tweaking, javadoc fixes, add version numbers