Some updates after public review