Added the code, with some changes for heists across rollover, and took out the correction code as it was a bit overzealous for reasons I haven't worked out yet.