Enum for the command table; cleanup warnings and comments from the previous commit