More support added for crops and misc. fixes