Further fixes for Zach, clarification for Mark, correction for Sarina