Minor updates to FR functions

Much work left to be done! Not stable!