Change the position of the include statement
fix a few
merge from NotFounds-dev-I and fix conflicts
fix indent style