Made minor cosmetic improvements plus fixed ring finding where there are
stray rings