Fix: cycle tag. Update comments. Add tests.