- updates to map_x subroutines; - other minor fixes