20141109 - Many fixes - see report for details