Brads Fixes

I pulled in Brad's fixes from Doug's branch fixed the conflicts.