added a ton of changes for maps mainly
fixed merge conflicts main.js