Cleanup parsers
Add logging info
Do some cleanup