fix cabal build and some cosmetic changes
some cosmetic changes