More documentation, plus always look for canonical files and merge all existing options with passed in filename options with canonical file options