Add new word cases
Fix letter case preservation