23.1, cleanup templates
23.1, finish oz-lbs-tons probs