WIP - many things reviewed ...

… full message in my next commit