Fiddling with folds.
Mapping tweaks.