Add option descriptions to HaskellWriter
Assroted cleanup