small rf mapping changes