Half bug fix, gravekeeper is still broken.