Durther tweaks
Further tweaks