Bug fixes in option parsing.
Fix puppet installation/trust; Fiddle with options.