changing option --path + minor bug fixes