Emergency Server fix

Emergency Server fix and new web socket connectivity system