Completing initial pass of comments on MADZ