Fixes for Copy and Option changes.
Merge pull request #23 from mrmonday/copy-option-fixes

Fixes for Copy and Option changes.