fixed a few things in rr3