lots of fixes, including having output be literally included in text