Work on better images, some patching of report