improve movement, indenting; remove togglefold