Add Jonathan's text, fix build errors, expand on a few arguments