multiple small fixes
fix merge conflicts