Changed order of things, rewords, wiki integration

If you want to change it, go ahead and commit to this branch.