Bugfixes
more fixes
fixes again
merge conflicts solved