bug fixes and copy change