atmos fixes

atmos and a few other minor fixes, removed 2 emitters in the SM
Revert "atmos fixes"

This reverts commit e4bd79b4fbf507f3ee85cfc612f54e8b7747a1b7.