Some foolin around with parsec
Improved parser slightly