action handling improvements