Minor fixes... including many missing javadoc comments !