lots of message fixes (WIP)