Improve C-M-n and C-M-u command