Added RF support and some other small fixes