Minor fixes + updated javadocs