visual fixes
merge