can't remember which bugs I fixed exactly