Lots of include fixed
* Fix a lot of bugs
* Fix a lot of bugs