Lots of changes fixes etc.

To much to list