fixed a few issues with message format