improve option handling from lessons learned