Massive Update

sockets now working correctly
other fixes