added town labels, minor label adjustments