Improvements a lot of things in core, generator and cycle dependencies