Brought Java classes up to speed.