Changes made to client code and server side. Fixes made.