+tweaks for stuff

Unfortunately, since Wikia just changed everything, I need to redo a lot
of things q.q
.