Mainly whitespace removal and now the cabal file builds two exes.
Merging Chris and my changes