major updates to content

reorder content, move stuff to end, etc, etc.