add some updates after last review