Thanks to Mats for taking the cleanup run through the code! I would like to cut one more RC, anyone have objections, fixes-in-progress? P