various fixes
fix merge conflicts