fix all the bugs
fix all the bugs