Messaging change and fix config formatting