Adding latest updates missed with the initial push.