remove non-functional leader mapping for d, expand wrap width, fix folding leader, remove redundant time leader