Code updates and copy changes