minor fixes
mergeritis