Changes made to regularise Item names (hat tip: David Kubecka) and to fix problems...