A bunch of minor changes. Moved post-parsing