Minor changes and fixes to Client and Server. Compiles without any errors. Ignore warnings.