made some additional changes.  good to go if you are happy with them