20141210 - Many fixes - see report for details