Checkpoint - supporting annotation without --per-gene. Also fixing a couple serious bugs.