A few content fixes and rearrangement