Rewrote ConstructAndConfirmPath (and some minor fixes)