Fixed CONTINUE bug and tweaked NodeEndCheck