made new templates default in fitting
implemented correction for statistics of new templates
minor changes