Correct path.
Bugs fixed