fixed a few ARC issues

What do you think? It's basically s/retain/strong and s/__block/__weak