Mutiny fixes? 3

Attempt to fix mutiny by replacing .Add() and .Remove() with += and -=
Merge pull request #213 from alex-gh/mutiny_fixes2

Mutiny fixes? 3