Some output formatting and README.md changes