did some more test and correct some bug that came out from tests...