Solved some bugs inclusions, still some to solve