better handling of opts
0.3.1