updating to java 7
minor edits for testing