refactored storage (moved logic out of map_control), implemented area-prefetch