More work on Java tutorials