small updates to copy, cleanup