fix some error and adjust something