More changes to acid rain
I'm back! Just took a two hour break, possible more.
Merge origin/master