Some parser code cleanup
Some haddocks and parsing example for #5