Change to references
General improvement to the sections