Clean up
WordArray corrections
Cabal corrections