Tweaks to copy and fixed date issue