Removing debug, updating map locations