expression fixes
Merge branch 'Nick' into Interim

Conflicts:
	ssn-report.tex