Better maps

see src/jsx/map.jsx