rf: few fixes and moving text around