updates to a bunch of stuff to the cross-server version, so it is more stable