Fix ups & java doc