minor todo form improvements