minor tweaks to next gen framework