Improve spectating by a lot