API updates and a few teaks.