Minor bug fixes. Minor parsing changes.