Tweaks to do better error catching and reporting.
New scripts and tweaks for paths.