fixes/tweaks/additions from assistEnhance