FINAL FINAL fixes since I am Shakespeare and God. I'm also responsible for Air Jordan's survival.