Add more atmospherics, code tweaks.