fix tool name in build and some minor corrections