fixed remaining API breaks

a lot of broken stuff still, though