cleanup and minor improvements

-better Haskell build behavior
-removing commented-out code