nextCycle fix + other stuff