added diamain to cabal file, cleaned up imports on main