added personal mappings
fixed some copying bugs