updated javadoc + small fixes