Added rain and a bit of a cleanup