Fix some comments and remove CtrlPTag shortcut