form class change
form fixes
merge