Minor Bugs/Usability Enhancements

Fixed some minor bugs and improved formatting of output.