* Switched the server and client symbols; they had misleading titles
** before
* Made the command line parsing much more flexible