Add some JavaDoc and toString methods