fiddles and tweaks
merge