notifySubscriber method now pretty much how it should be, other fixes