minor fixes
merged conflicts