some cleanup, and wrote 'scale-within-region, though its aspect-ratio correction idea doesn't work as well as we thought it would