Adding wiki images, and various other changes