added/tweaked opts