add command line options + update todo, comments