Small adjustments and bugfixes
Merge