fix vpath issue, and some other cleanups