Change to spec.txt, some changes to FileParser.java (clearer code also)