Updates to get the wsumage server running right

more to come later, just needed to pull the stable state