Merge changes with Myrridin branch (copies and margin functionality)