Fixes for engine.io handshaking issues, and refactoring.