added weather icons plus some major cleanups