small updates in FUN and substitution
slightly updated substitution