Update to ghosts, trying to fix bugs