minor changes to project, refactored java output