Fixed status success/failure flag, added blocking to disco, TBD duplicate