Some cosmetic bug fixes
attempt to merge, Monday, October 13 late-afternoon