updates with best attempts at map + weather