better state monitoring, fix excessive piping