bugfixes
merge