fixed leader mapping and indentation