Speeding up removing, adding subscribers, bug fixing.