Minor fixes, chapter reorganization