Copy changes

Resolves the various issues in #118