Fix wrap again; fix atmosphere scaling when wrapping.