I redid the thing

mainly because i was really bored 
i left out people i think we're supposed to be pretending didn't exist (also may have accidentally left some others out, but oh well.)