fix some error message and adding some commits.