Added Java docs, cleaned up some