Fixed!  from now on, any bugs are the ones I'm actually interested in