various small updates
merging