corrected bugs with real websockets
merge