Added some bugfixes to CROPS.