Fixed units
More complete trace point generation
More vc_edit work
Element counts by fault added