Fix printing of foralls
Clean up substitution application
Cleanup. Fix cabal source.