messages and other fixes

messages and other fixes