Minor changes, fix output

Fail fast strategy