simplify runner and add basic cli-argmuments
some cleaning up