correct syntax error
correct wrong include
few optimisation
merge