Content update and minor changes...