Inject errors

1. The bulk of the changes are just comments
2. inject error mechanism will now only be triggered during make (make INJECT_ERRORS=1). This reduces the chances that we will accidentally merge in code which has inject error on.