Merge pull request #16: Code and copy fixups