Added minDiversion to AtmoOrb handler and some cleanup