Fixing one.
Adjustng to use a stable file.
Rolling back some stuff that is quite broken.
Merge pull request #34 from KirinDave/master

RR 2.5.4 changes