now i've definitely solved all the bugs