some parser improvements
Minor cleanups