Data update

Almost done, just need Mepukta's pics.