minor fixes
merged