cleaning up health handling
Merge branch 'rewrite'