omit/copy speedup
omit/copy fixes
fixes
copy refactoring
cleanup