Update content + minor adjustments