Changed some strings to char* s