minor opts and cleanups