clean up some gaffes in forms