reordering pictures and formatting
merging with james' changes
merging
merging sara's descriptions