ClosureEntities updates in code
Improvements so CR doesn't hang
Merge branch 'master' into new_closure