Fix issues and speeling errors