cleanup some comments, tweak ugly ring code