Updates for most of the minor comments not yet addressed