Added 2 more actions & fixed variable replacement