fix all the remaining bug for the version 1.0