Finished testing, made some small changes to output