fix up file locations, other minor tweaks: