fixes
merged n fixins