some fixes
merged