copy fixes
moar copy