Thanks. I've made changes for 1 and 2, and think your fix for 3 works.