fixes
minor fixes
merged