Fixed bugs involving new commands, special characters