Handle nulls better and make form elts readonly