Bugfix: cycle detection was broken due to typo
added TODO
added more notes