perf tweaks, mapper key shortcuts, arbitrary moves & fixes