20141211 - Many fixes - see report for details