add XXX's, fix typos