Some additions, and re-arranging.