small updates
merging