more rain bug fixes