Fix bugs
Update from Joukahainen
Add missing forms