Gehry edits Canadian skyscraper plan to be 'more Toronto'