Add self-loops to specs, add comments