Additional Updates

Greg, I made some additional changes if you would like to include them,