fixed up server some more