more fixes + javadocs added