fix closures, and disable var init filter