Some manual crops and crop.py updates