Some rf, and fixed a bug.