Some mapping changes and better pasting