Added lots of copy and mods to images.  Broken a test...
Fixed that test plus more cosmetic changes