Scoreboard and hightlight fixes, cleanups.