Various updates to writeup, minor reorg