Couple of fixes, some new words