random fixes
merge