Minor fixes and improvements to option strings