fixing a couple more parsing issues