some more improvements that invalidate saves.