experiment 3, updates to parser to fix bugs