More updates to gss files and client/server