Some cleanup.
Fixed broken closures! YARR!!