some minor changes, commandline parser...