added Anne's stuff to the pages that lost it during the merge + a tiny bit of other stuff