Add Solakka
Add Ulappa, Savotta
Add missing forms
Simplify