Add figure.billboard and tweak variables