Addressed half of the issues raised by Barry in his AD review
Addressed more comments from AD review (related to VANISHED response description)