rpd bug fix and other minor changes?