usage/options: quick and dirty update, still need a lot of work.