Added a NutrientHolder
General tweaks and fixes