Fix file paths and some tweaks