Suggested removal of [:] copy, other minor fixes