Hopefully finished javadoc