Merge latest updates

Adjustments and bugfixes