fixed issues with server and messaging.