Bunch of changes
Corrected bug in complexity of cycles with value > 1