fixing warnings uncovered by compiling with -Wall
better cabal setup
finished merge
finished merge