Update the readme, move a few things around
Change a few minor things