#264
#263
Tweak for #261
#255 changes
#258, additional tweaks