improved add and edit of maps