more copy fixes...