small fixes
merged