code fixes
merge code