and some more message fixes