Fixed special character error and made some

impovements