Combine some project , fix some bugs