fix everything but map