move the constants to better names, including COMMANDS