A number of changes for includes resolution, quick resolve is working, the per-script resolve is in progress