Generaloption extension and fixes for eb