random fixes
merged