Self edge spacing tweaks
Tidy up self edges generator, add comments