todo
command line interface improvements