Cleaning up the server project
Making tweaks to the client apps