Fixed crab templates (added HelperMatchToGen). Resub tth as v8a