update to use underlying changes and a few fixes