fix closures and reenable sink