some improvements to the new options