cleans up and fixes copy