first round of post-BTV-13-001 updates