more definitions, not all, yet

Conflicts:
	shanghai.tex