Added counter, clean up forms, numerous fixes