fixed form issues