Correct message format and more