Read the socket in the clientHandler, pass events to the EventHandler
minor fixes
Removing some refs to Mac that we dont need