renaming some stuff
updated the command-line runner