data and map updates, working on tooltip