fixed an issue with overriding options; other minor clean-ups