Moved the entire paper and all functions over to using energyType=NA for models where you don't want energy.