Fixed Rapier per Ralathon, added non-RF support