additional improvements and fixes for regressions introduced in the last mega-patch by Jonathan Wilkes