Minor modifications and progress on FunctionToVariable