making option improvements