Update Data

Updates data more. Almost completely done formatting!