Fixed retain Cycle, some other small changes.