minor rename
addend some new
merge