more action#execute return fixes
and more...