small parser fixes after more testing