Cleaned up weatherrandom and other code