Fix and use FlaggingNode
Small improvements, use smaller start flag