Closure borrow

merge and fix closure mutablility