Added some more output formatting stuff