merge diff from towns 14d

Merged differences from original 14c to 14d into our files .. now the
work really starts to re-rationalise things