Changing the MCP CLI client to send a uid.
Updating comments, removing some unused defined variables.