Fixed all the bugs :D