bunch of server changes