update log printing and some function name