Correct weather for next 24 and next 7.  Tidied up logging