address feedback on review

 - Test with and without feature flag
 - fixes for feedback trivials
 - don't use custom struct for action supercommand