fixed messaging, increased security