more fixes to opts
some tweaks