Add more comments
Correct invalid locations