20141208 - Many fixes - see report for details