Updated text, integrated Xuan's stuff