20141219 - Many fixes - see report for details