fix and tidy messages