Options and Tidy changes
Update for flags, options, examples