Use square thumbnails; Replace imagemagick with gd for image manip.