Added healing and fixed more crashes