Fix heads + added ocelot heads + wither has a small chance of cropping more than one head

Also tweaked the ender scythe a bit