production settings
Fix messaging bug