Better handling of arguments and working directory.