small updates
merge