Fixed a few issues with printout