20141027  - Many fixes - see report for details