More changes made to nearly complete cleaning

Need to combine remaining incorrect evtypes, show results, polish and
knit final product.