NOT A USABLE COMMIT ; adjust some more stuff, mostly moving options around