yas fix, various grammar cleanups, haskell alignment