Cleanup + a few additions, ReactiveCocoa extensions, etc.