Handle scaling properly so we can display the correct cropped rect versus the original image. Also sorted out a nasty little bug fix.