maps and fixes