added Nh to iterate, SaltDerivatives, removed GetNh (which is completely wrong because you can have passive modes when Nh > 1!! )