few change for building, and correction befor pull request