Wip issue/resolve warnings4

next try...