further form improvements