Sorted health handling code and reagent handling, minor tweaks