tweaks and fixes
fix conflicts