fixed some stuff, added weather stuff
merge