Some shuffling and tweaking of docs