Eddited command classes, config still not fixed