Add some JavaDoc comments, still work left to do