Made output formatters a bit more modular and added a few to the mix