Fixed form errors, proper headcount in progress