fix maps, clean js