Fiz bug in work with path, minor changes.