spectator fix and more!!!