Fix a few regressions ; misc. enhancements.