fixed many issues with Closure