added haskell stuff and fixing commands
fix merge conflicts