Move around and add some things to make the doc nicer to handle