cycle and other fixes