Formatting

Fixed a bug, changed how messages are displayed