RF: finishing touches (hopefully)