Cleanup lsof parser
Add haddock