add some variable expansion