Clean up some docs

Document the code better, and add an @Override to remove a warning.