Path projection + minor bug corrections