minor fixes
untangle the controller_action_data