content reorg, minor updates