Add missing forms, move words to Joukahainen