Tweaked code in all cases, Fixed the Flag capturer so it avoids after
capturing the block