Start refining the client

Also a few minor server side tweaks