Fixed bug in healing, clean up