Recover from pipe-breaks; fix
Improve block constraints; fix
Update tests