Use absolute paths for files, consistency adjustments and a comment fix.