Add U option to optstring and make case consistent in options list