adding corrections as asked by zanuz on last meeting ... still there are changes to do