some bug fix, become faster..