better action handling & execution