Significant work on atmo class.

A lot of work done on the atmo class file, small changes elsewhere.