More stuff
Fixed Java Doc