code reviewed, editor-folds added