Escape points, scoreboard fixes, other additions