Can now wait on server to startup

An assortment of other changes as well