Some small changes, and cabal support.