fixes for spacing in txt template and additions to moderncv template