Cleaned up some output formatting & basic error case