Patched a bunch of stuff to enable keeping track of viewpoint on publish