-Add other requisite socket switches to client
-Add slightly more informative server msg