fixed form issues and count