De-@ move maps and rework parts of trans.