update for rc2
oops, the non-new stuff too