Fixed all the bugs!