cycle detection, better fixture, comments