added bookmarks, nicer location search