More cleanup, modal bugfix, use own location for map