some small fixes
merge conflicts