Minor changes for some work I'm doing over in dapClimates.

Just moving a few things around, shouldn't affect anything.