Improvements to Rain class.