Fixes the bugs

Here you can see that I have done all the things.