Fine tuning stuff
Merge branch 'tonyEdits'