Correcting selected word, some bugs ...