More work on the dinosaur parser thing along with some style cleanup.
The thing is probably now more broken when I tried to get all fancy.