Added even more javadoc