Removed global state from Redraw method in options-mode!
Minor fixes elsewhere
Org updates