random fixes
merge complete