Updated TODO
Fixed some bugs with includes
Updated TODO