fix the little bugs in our project