Minor changes to client

Mostly comments, describes what will need to be done