Improved lazy-evaluation of the Referee class and a couple other things.