Fixed problems with path.
Some modi