Revised filepaths, etc., simple clarity fixes