more tests on cropping, plus some suspect fixes