Path collision now fully works.
Some minor fixes.