Trying to live without numbers...
Improved NextIndent
change of leader and lots of changes to maps.