Add data to map popups and improve notes