Various tweaks plus started playing around with socket.io