4th commit

lots of changes, added weather, added calculations, added lots of things