Changed map.js a lot...