Cleaned up consts and cmd.py so they match.