Fixed UTF-8, added Commander fix