some test and bug fix