minor fixes
minor fixes
merging