Made it awesomer...

...by fixing some of the output summaries and catching specific return codes.