Fixed all the bugs

ye