Review and updates

Review and updates