some width fixes
some width fixes
merge conflict