a bunch of changes I haven't tracked well