tweak condition order in captures and edit comment