Replace <C-S> commands with others

that don't freeze the screen.
Add another todo