update, fix some bug for windows supporty