fixed all of the issues omg!