minor cleanup and enable weather report collection