Implement C-Y and fix C-W