remainder of features / perf. enh. for 2.2.3