more work on parser.java