Minor improvements and some corrections that better match words in the language. I adapt it as I test it.