Lot of fixes WIP#169  WIP#170 WIP#171 WIP#172 WIP#173 WIP#174

WIP#169  WIP#170 WIP#171 WIP#172 WIP#173 WIP#174