updating content, fixing bugs