condensed stuff in Rain.php, its obsolete anyways
minor updates