forms fix (wip)