fixes more form issues