more promise tweaks