Fixed conflicts and compilation errors
Fiddling with csycles