Failure agent WIP + tweaks