main fixes
merge conflicts