Long polling and websockets final touches