Fixed some bugs with includes
Removed some unnecessary things
Added quite some docs