add all defaults and variable references back in