fixed all of the bugs