Tweaked some more stuff in the parser... it's a work in progress.