Image handling and various bugfixes.  Just have text shortening left to deal with.