More fixes WIP#198

Done WIP#187 WIP#198 
in progress WIP#102