More attempts to get images working and lots of little improvements