Cliffhanging improvements
Better Cliffhang detection