Change some minor things
The client compiles.  None of this is tested at all yet.