various java hw1 changes