Checkpoints added, debug code removed