Improvements to backend, sockets
Merge remote-tracking branch 'origin/master'