Added some love to the server
Small clean up in the matlab client