aaaaand some more javadoc....