Lots of changes :-( Not going through them one by one.
Reached a level when all seems to work.