update

updated pages from last friday