Some fixed, some bugs need to be yet fixed