Minor problems from Checkpoint 2 fixed