Address some of the problems with my original command generator