steve:  add new parameters to fit script
steve:  clean up warnings
Merge pull request #4 from sjdayday/master

Master