Further progress on java generation. Minor correction to Makefile