Fixes to data passing, scoping. Closure reliable.