fixed some form issues