Fix some parser bugs, find some others