Better folding methods and some new keystrokes