Changing some documentation and also dequeuing after firing done/fail