Fixed more comments from Barry's AD review

Final -09.