Add Enchant command, fix TPX