removed debug options| reshaped action set