updated content and some bits