Tweaked action handling

* now the actions return name and body