Missing calls to super added where necessary.
Local variable qualifiers __block changed for __weak.
Merge pull request #72 from emilyems/SomeFixes

Some fixes