Fixed all the bugs :)