Restored 'Option', moved some code into editor folds