elaborate TODO
cleanup commandline interface
update TODOs