Fixed TODOs and FIXMEs. Added support for not printing to dumb TERMs