more cleanup, and MapAll wip