add rng
added rain
cleanup