Update rafc.rb

Fixes and enhancements