Added TextFormatter, minor formatter fixes.