Fixed errors in CommandHandler to make if/else statements use correct
static ids etc...