Merge laest updates

Adjustments and bugfixes