Added more folds and incorporated settings from Steve Losh