revert to error free zone
Ooops cleanup
more changes