small improvements in forms