Made some major changes to output formats