Added more languages, moved a few things around.