oops -- fixed some pushed conflicts :(