Some incremental progress on the java wrappers