Ominor fixes, updated words list