added catch to map, added weather window