Proper error message
Incorporated new fitting methods
os.path.join is more portable than just concatenating filenames