Add some more JavaDocing