fixed all the bugs. YAY