minor fixes
update
merge conflicts