Improved output, fixed couple minor bugs