More opts, bug fixes, refractor vars, safer saves