some improvements to the forms