Corrections from MatN review as done by Andrea (mostly)