Fix formatting and copy more stuff from the wiki