minor fixes during review
mergeconflicts