more tweaking closures